Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve #50, Add baseline and build number to version.h #51

Merged
merged 2 commits into from
Jul 19, 2020
Merged

Resolve #50, Add baseline and build number to version.h #51

merged 2 commits into from
Jul 19, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Jul 7, 2020 •
edited
Loading

Describe the contribution
Resolve #6
Resolve #50

Testing performed
Bundle built using docker gcc+cmake image.

Expected behavior changes
Version reporting now uses the version numbers defined in elf_version.h and reports build number.
Screen Shot 2020-07-19 at 12 55 27 PM

System(s) tested on
Ubuntu

Additional context
None

Third party code
If included, identify any third party code and provide text file of license

Contributor Info - All information REQUIRED for consideration of pull request
Gerardo E. Cruz-Ortiz, NASA-GSFC

skliper
skliper reviewed Jul 7, 2020
View reviewed changes
elf_version.h Outdated Show resolved Hide resolved
elf_version.h Outdated Show resolved Hide resolved
elf_version.h Outdated Show resolved Hide resolved
jphickey
jphickey previously requested changes Jul 7, 2020
View reviewed changes
Copy link
Contributor

@jphickey jphickey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest to name the elf_version.h file as elf2cfetbl_version.h. Other comments inline. Also agree that we shouldn't re-state semantic versioning here. Just reference/link to existing description of versioning scheme.

elf_version.h Outdated Show resolved Hide resolved
elf_version.h Outdated Show resolved Hide resolved
@astrogeco astrogeco force-pushed the 50-add-build-name-and-number branch 2 times, most recently from 68f8e14 to b1cc0a3 Compare July 8, 2020 00:55
@astrogeco
Copy link
Contributor Author

This is what the result looks like right now. I'm going to call it done and we can fix the string format later.
Screen Shot 2020-07-07 at 8 57 24 PM

@astrogeco astrogeco force-pushed the 50-add-build-name-and-number branch 2 times, most recently from 29c72fd to 38e8771 Compare July 8, 2020 01:15
@skliper
Copy link
Contributor

skliper commented Jul 8, 2020

Any update on the concept that any development build would report the codename/build, and releases would report the version number? Or obvious reporting that this is development build Bootes-1 based on top of V3.1.5.0?

@astrogeco
Copy link
Contributor Author

Not really, for now i think we can have it always report both version and baseline+buildnum. Also I'm calling it bootes-30something after running git describe based on the Aquila tag

@astrogeco astrogeco force-pushed the 50-add-build-name-and-number branch from 38e8771 to 2867659 Compare July 8, 2020 13:11
@astrogeco astrogeco force-pushed the 50-add-build-name-and-number branch from 2867659 to 6da0658 Compare July 8, 2020 13:17
@skliper
Copy link
Contributor

skliper commented Jul 8, 2020 •
edited
Loading

How about for development builds: Development Version: Bootes-30 (30 commits since vX.Y.Z tag)
And for releases: Official Release Version: Bootes-vX.Y.Z

Or similar?

@astrogeco
Copy link
Contributor Author

Yep, the text works for me, I thought we wanted to automate that's what I was referring to with my comment. I can make the change manually now but the other repos might be a bit trickier

@astrogeco astrogeco changed the title Resolve #50, Add build name and number Resolve #50, Add baseline and build number to version.h Jul 8, 2020
@astrogeco
Copy link
Contributor Author

This is what it looks like now.
Screen Shot 2020-07-08 at 10 44 00 AM

Resolve nasa#6, Replace hardcoded version string with
169cd8f 
Create version file and macros to match implementation in other cFS repositories
@astrogeco astrogeco force-pushed the 50-add-build-name-and-number branch 2 times, most recently from 325a9f2 to 90cd360 Compare July 13, 2020 15:02
jphickey
jphickey reviewed Jul 13, 2020
View reviewed changes
elf2cfetbl_version.h Outdated Show resolved Hide resolved
@astrogeco astrogeco marked this pull request as ready for review July 13, 2020 21:59
@astrogeco astrogeco force-pushed the 50-add-build-name-and-number branch 4 times, most recently from 2fc08bb to 659337a Compare July 14, 2020 15:44
@astrogeco astrogeco force-pushed the 50-add-build-name-and-number branch from 659337a to ebd2796 Compare July 14, 2020 15:46
This was linked to issues Jul 15, 2020
Create version header file, update to x.x.90, report on execution #6
Closed
Add build name and number #50
Closed
@astrogeco astrogeco dismissed jphickey’s stale review July 15, 2020 15:56

Renamed file as requested

@astrogeco astrogeco added this to the 3.2.0 milestone Jul 15, 2020
@astrogeco astrogeco changed the base branch from integration-candidate to master July 15, 2020 16:32
@astrogeco astrogeco changed the base branch from master to integration-candidate July 15, 2020 16:32
@astrogeco astrogeco force-pushed the 50-add-build-name-and-number branch 3 times, most recently from a6ace68 to a39b6d4 Compare July 15, 2020 18:39
Resolve nasa#50, Add buildnumber to version info
dac9f74 
Reformat string output for "elf2cfetbl -V"
Add string helper macro
Add macros for buildnumber, elf2cfetbl version, and version string
Set buildnumber
@astrogeco astrogeco force-pushed the 50-add-build-name-and-number branch from a39b6d4 to dac9f74 Compare July 19, 2020 16:51
@astrogeco astrogeco merged commit 61df553 into nasa:integration-candidate Jul 19, 2020
@astrogeco astrogeco mentioned this pull request Jul 25, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jphickey jphickey jphickey left review comments

@skliper skliper skliper left review comments

Assignees
No one assigned
Labels
CCB:FastTrack
Projects
None yet
Milestone
Bootes
Development

Successfully merging this pull request may close these issues.

Add build name and number Create version header file, update to x.x.90, report on execution
3 participants
@astrogeco @skliper @jphickey